Cleaned up CLI option reading.