Redo options to use list-options.h