Merge: from alloc_clean_june2026 - Optim: amortise or remove 19 allocation sources Tests: on craggy, gathered resources, built a mini base