... which may require small api changes @yoshuawuyts Sorry I hadn't gotten fully to this, here's a work in progress follow-up commit I never finished: #335