Now handles expressions ending in a newline character