Improvements to automatic data output helpers.