Further micro-optimization