Better comment delete support