Adds var->annotated-handler fn and refactors ns->handler-fns to use it.