Clean up option parser some more