Ported some to eclipse ast instead of intellij