Simplify the handler wrappers