Improved parsing of substances... tests will follow later.