Some more code reformatting.