Completed replacing magic strings with SystemOptions.