Commands are now separately given to handlers to prevent comodification errors