Small code tidy-ups.