Improved comment handling.