Simplify comment scope handling