Update to latest trunk (mainly implicit args changes).