V3.1, updated for ecma_ast V2.2