Further libxo.3 cleanup.
Merge branch 'develop' of https://github.com/cbrueffer/libxo into develop