Most stuff OK, ready to tackle changing descendent allocations.