Sometimes these new underscores are outside of quotes, sometimes inside. We need to be consistent.