Tidy-ups for 0.7