prepareASTforIfdeftoif functionality moved into ifdeftoif class
fixed test_alex_16 (removal of features from opt nodes in return statements)