Codex: The codebase feels much healthier after the recent changes.

I agree Codex.