Minor Efficiency Improvements.