Commit before polymorphization