Merge pull request #676 from TheBlueMatt/2020-08-c-bindings-cleanups-3