Fix over-zealous tidying.