Prepare for adding ecmaVersion 6