Merge pull request #1184 from TheBlueMatt/2021-11-c-bindings-tweaks