Fixed parsing issues for optional params.