Update to latest xhp master.