Minor code enhancements.