First pass: general clean up.
Finish properly wrapping the rendered_file formatter.