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