More little bitty optimizations