Remove email shortcut - it's too darn controversial, and there's no *right* answer.
Make a few fixes in the translations and shortcuts.
Make tests work within a closure to prevent variable "leaking".
ALL THE SHORTCUTS!

Note: quite a few broken, but they can be fixed later.