Stylistic changes (prefer point-free style where possible).