Also updated the lock file as part of this, and there are a lot of
changes there.