SONARJAVA-9 Fix AST construction