@bnoordhuis do you have a suggestion for an improved API here? C++ API design isn't my strong point and I'm personally fine with breaking the API a little for the next major release.