More work done on the optimiser architecture.