More cosmetic fixes to address style nits.