Update to be somewhat closer to pairty with

the mojolingo codebase