More modernization in _optparse