Removed options=() with fixes from upstream.