Added support for shadowargs
Passes a few more masgn tests