[cvs-nhc98] patch applied (yhc): Optimise drop1 slightly further