Added bracketed expressions and variables. Error messages now show the line number.