Couple of solving-related mid-end tweaks. Firstly, when we generate