Simplify handler definition/generation.