Fix vars-only substitution of cross
Fix vars-only substitution of ignore and one
Some work on recursive cut
Merge branch 'dan-master'