Created attachment 74199 [details] [review]
New patch, from git-format-patch

I have fixed the style issues, I think,  I also decided that the static
functions should become methods of the Collection nested object, which I think
is neater.

Commit message added and git-format-patch output attached.