More compile-time optimisation tweaks.