Simplifying Dispatch using macro reification

This should be a purely cosmetic patch. I tested it and it appears to work fine. Nevertheless, I'd prefer to have it reviewed by an expert as well since I'm not fully confident about it. Macros aren't the easiest to deal with.