Follow-up (micro-?)optimisation

Change-Id: Ia49cb02b2374e1c284bb4dee77e333fe6c8839ce