I'd prefer if we fix this later - this is a case where it was just poorly written before and my changes aren't affecting it (although we can, and probably should, change it later).