Move some general options into, well, options