ENH: Fortify building of output dicitonary.