ES6: Align with latest spec numbering