While this is outside the scope of this fix, I think the docs for this class and its constructor could be better. Could you please add a TODO to improve the docs?