I'd prefer to do this as part of this patch.

If you are busy, you can tackle other comments and I can do the class refactoring once other comments are addressed.