Some efficiency enhancements.