Issue #2212411 by LinL, znerol: Code style cleanup of language system.