Merge "Revert "Revert "Add basic checks for redefinition."""