Fix #498. query() should be an API method and rely on drush_get_option() as little as possible.