Take the ES5 changes for activesync and wbxml