I'm OK with a "code cleanup" bug.