Make options optional

Because options. I thought I'd done this. Ah well.