Update some simple plugins to new API, update C++ wrapper