Tiny bit more code cleanup.