Simplify COMMENTED_SETTING_REGEX to match SETTING_REGEX