hjq: apply hlint suggestions