Merge v1

Please change this so the type is grouped with the errno, like `(errno=%d, type=%x)`. Also in other places below.