types: Merge types 29 and 30 into types 22.