Summary: Smaller fixes to ensure that Zero still works with non-standard options.
Reviewed-by: twisti
Contributed-by: NGary Benson <gbenson@redhat.com>