Hook up body constraint checking to parser, add/fix tests