Cleanup heredoc parsing some more