Performance KW optimizations II