Standardize on a base handler; simplify each handler so it only contains what it requires.

There's more cleanup that can be done now with the list of things imported into template values, but all in good time.