Fixing a few bad style merges.