#1: Global code refactoring, collision simplified.