Jeremy's patches for more robust handling of unmarshallable types.