No longer allow the -std options to entirely override the -x language option. This allows -x cuda -std=c++11, for instance.