revision: simplify argument parsing.