Improve option processing.