Make short (and long) options, er, optional (II)

This extends #9.