Just as you said....O'Reilly's has the 3M cleaner. I bought a bottle. And, interestingly enough, I had to ask for it as it wasn't a shelf item on display. It was in the back where the public isn't allowed.

Thanks for your help. I ought to have the headlight cover problem resolved.