Code generator enhancements