Flesh out trimmer (compiles; untested)
Fixes to trimmer & wrapper to pass more (not all) of h4-test