More unused/untested small optimizations