Minor changes to AST, need to integrate with unstable Z3 for Python 3
support.