Cleaning up option parsing code a bit.