[15/15] Deduplicate handler boilerplate and close the remaining correctness gaps

[15/15] Deduplicate handler boilerplate and close the remaining correctness gaps #397