Some micro-optimisation