Tidy up indentation in a few places.