The reconciliation code currently lives in a single source file. It is difficult to navigate, and complex to find bugs.

I think it would be better if it were split into sub-files, and had a general cleanup pass.

This will make back-porting reconciliation changes more complex, but I think it's necessary to keep the reconciliation code maintainable over time.