Refactored all calls to Object.keys or core.Object.keys