Improvements for lint compatibility.