More KNF and style consistency tweaks