Minor MOSES cleanup
Merge pull request #724 from linas/m2

Minor MOSES cleanup