More progress on mutagen 1.22 support and tests.