Misc style updates here and there.