Make custom evaluator handlers more idiomatic