Requested by pedro
With these changes the type is good for general consumption (modulo the limitations mentioned in the manpage under TODO).