Updated to work with the new version of bar-aint-recursive