util/scopes: Handle single line comments also
util/simplify: more wip