removed ifdeftoif prepare AST function, enforcetreehelper now back to its original state from @ckaestne
Merge remote-tracking branch 'origin/master'