Split new conversion code with old code to make it easier to work on.