Slight tidy-up of a bit of code.