Some more heredocs changes...