Add check for continue_session.
Consistent ordering of options.