Minor rewiring.