Minor style/performance improvements.