More minor tweaks to improve code quality.