Improve handling of strings and heredocs