Minor tidy and re-added IdLock.