Improve use of lockfile API