LP#1977554: (follow-up) style tweaks