Extend launch related switches till after launch.

Finally the end is in sight for these...