More faffing with demunging of type names & descriptors.