o more style-guide tweaks.