Eliminate chaining of lexical units (#13594)

This removes the last cases where lexical unit chaining
was used.

Change-Id: Ib5cccdf510fb6fe7eff10a856f3b274901886b59