box calls in parens to avoid syntax issues with hashes and arrays, don't
interpolate heredoc.
clean up some trailing whitespace.