Update predef, xpressive from develop.