Made dispatch shorthands into inlined functions (You can't break inside a block passed to a macro)