Minor refactoring of spec wrt option extraction
Tiny cleanup