More work on language toggle.