Update xpressive from master.