I'm planning on fixing sup for alpha. It's actually pretty ugly-
so presumably it might be cleaner elsewhere?

To whom should I send the diffs to?