Finished polishing Collection code-gen