More attribute escaping progress.