Merge pull request #638 from TheBlueMatt/2020-06-c-bindings-cleanups-2