Is there some reason not to just fix this XXX before checkin?