Separate opts that require a `nan_switch` from those that do not, to avoid unnecessarily complicated graphs with nested log(exp(...)) forms

Closes #360