Code enhancements.