Improvements to {cgsi_convert}