A few post-merge cleanup items
Some callback handler helper utilities