Follow syntax formatting rules more closely.