Do you mean implement this change, along with removing "simplified CommonJS wrapping" everywhere? See my link about the "sugar".