On the way to replace tests @reg.generic with @reg.dispatch. Some
tests work, some tests require more work, some tests require more
thought.