Tests pass.  If this can get merged up with upstream, i'll merge this pull request.