L22 typo fixups.
Integrate L21 and L22.