Closes #3373 (closed). Refactors simulator options to better support future changes.
Changelog: refactor