Merged in my new-ish ECMAScript TM2 syntax