This fixes a warning left by the earlier optimization and
addresses one of the other hotspots identified by GProf.