Various code enhancements.