Removed minor optimization that was probably more dangerous than helpful.