Collect result along with the nodes

Inline the print_step_container conditionals to expose the ugly!