Update to match latest code from Node.