t64562: address code review comments