Lockfile related cleanups.