Handler-related cleanup

I don't like creating a bunch of independent variables that all get slurped up by one another. I believe it also clarifies what's going on here, hdlr just wraps another hdlr