For #57, admit underscore as a legal option character