pim: T5733: incorporate feedback from peer review
(cherry picked from commit 64b4cfc71d402222fd6b034336b3588b5986ba24)