Merge pull request #1374 from TheBlueMatt/2022-03-bindings-cleanups