Improve munging of more bizarre non-pod