Changed to use simplified lock API.