Fixup ice-options

Splitting the ice-options class off into its own thing.