Make options parser slightly more flexible