Very minor code tidy-ups.