a few more micro-optimizations