Further improvements to comp eval code