Minor cleanup, to keep the codebase a bit more tidy.