Tidied the new MI implementation further.

And fixed a bug introduced into it yesterday: closes #320.