Normalize handler signature per #102 and #80