Tweaked commenting autoclose behavior