Minor naming and performance improvements.