Tidied the new MI implementation further.

And fixed a bug introduced into it yesterday: closes #320.
Removed useless single-task validation complication.
Merge pull request #322 from hjoliver/320-bug-fix-MI-again

Tidied the new MI implementation further.