See my comment in #82 This change is going to inteoduce breaking changes, so it'll be addressed in v23+.