REVIEW-876: some cleanup.