Update to handle option function parameters correctly.