I'm gradually working through the sorted diff of the decompiled source, copying over implementation details from the updates fenoxo has done in CoC to the codebase.
And here are lots of the changes, as implemented. Also, a lot of derping around in rubi's code, to make the new cocktypeenum work with the existing code.