Fix typo from last commit. Cleaned up language choice mechanism slightly.