More improvements to ingredient parsing