I think this cleans up the code for matching on modes a little bit. At
least most of it is now type checked so it'll be harder to break stuff
with the mode defines.