Small optimizations

No match.