Performance KW optimizations II

No match.