Remove lock observation; remove lock types; add references; refine definitions.