Make some function commands generate <mo>. Fix issue #12