It would be nice to have a comment block above this section.  It is not clear what the goal is for all this mayhem outside the context of the PR.