Separate language option handling into 2 phases