Improvements to parse_equation(); added tracing macro