Fix bug in simplifyRecursive.
Merge branch 'master' into vodka