Better comment management.