Simplify command module option parsing