WIP re #26.