Move from handler.name -> event
Only skip handlers array if it's there...
Use correct key for state application