Made ToxOptions more idiomatic (I hope)