Tweak HW2 Q5 for speed.