Fix argh bugs argh argh.  All tests pass!