Fixes #12 some more.  Prevents moo code from stacking too deep.