Oops, missed a few changes from upstream.