Please restore these codestyle fixes that have been reverted.