Rework argument-picking.

  This should update #199.