This will break some existing code, but that can be fixed.