Style fixes after mega-merge