Fix support for a list of language standard options

The change in !784 (merged) did not change all the places we add the language standard options. Expand the list in the other places.

This MR contains one sub-topic that is meant for backport to release for 3.9. The rest of the changes are related fixups for master.