Move a keepaway check into a mutator hook