Misc. performance enhancements.