@blanchonvincent didn't find any other breakages, and added tests to verify that your use cases are covered ;)