Would probably be the best option. I didn't really inspect the API changes this PR proposes, just looked at the code and found some things that could be improved :smiley: