Faffing around with intermediation language.  Closes #404.