minor improvement to '&&' productions; <pick> => <combo>