am 8849aed: Slim down chooseproduct (used by choosecombo).

Merge commit '8849aedde07373948b45a55703e7764de0a7199d'

* commit '8849aedde07373948b45a55703e7764de0a7199d':
  Slim down chooseproduct (used by choosecombo).