Further tweaks to code layout for consistency.