Merge pull request #3380 from clumens/free-nouns
Do a better job freeing private data in output objects