Cleanup and fix the Convert() not carrying through the parameters.