Fixing some return types for Unparse()