Conversion changes complete

All functions now working with the shorter list-recursive functions.