Remove most cosmetic differences from master to reduce merge obstacles.