Removing `cls` argument from normalizing functions...