Add a flag to control whether we try to strip attribute markers