I did a cleanup in this commit: https://github.com/hypothesis/h/commit/449a5da6ebd20e62c3ff4f56227fd70c6551abd4