Fix handling of options containing the '=' sign.