Making RegistrationHelper more strict about when it is and is not an
acceptable time to register things.