Return modified ast. Fixes #1