Major internals work this week as multiple refactorings land.