Well, if it's obsolete should we avoid adding more code to single out these corner cases?