Reorder unpackb() branches to match order in packb()