> Anyway this PR is useful with the existing API and logic of the current
> codebase. Also I don't think this class will need to grow any further.

OK, so a few minor changes, and we merge.