VOL-42: Misc. improvements to coding style based on feedback.