Cleanups thanks to Dominic's sharp eyes.