A few small improvements

[camirmas]

I haven't had time to officially benchmark these, but they'll give us a small performance gain.