Re-added semantic colorization fix for colliding types colliding in value and namespace space, added a test.