Consolidate scope variables into $action

Also remove `$actionFailed`, add `$action.error`