Moved some configuration out of options.