Remove some unnecessary indirection and jump right to the handler functions.