refactored buildObjectEnumerable to be a single package
refactored buildObjectEnumerable to be a single package


Former-commit-id: 7c3c7dce5e542efcd3c9d659dd905d86b44d9f27 [formerly ba23a09512a2fd091b4f42f5e0f279342ac17405]
Former-commit-id: 6378af79cf044b74e421cf363202d70bed9edd44
romancow/Sugar,andrewplummer/Sugar,andrewplummer/Sugar,romancow/Sugar