Make rewrites reflect current language, system.

Modernize language, simplify structure.