A few style clean-ups.