Document and refactor LockAware trait