Fix #515. Order of options with -G and -S no longer matter.