Re-do r530415 and other patches that skip certain defines in a more
elegant way. Matching strings rather then regexps is preferred here.

The problem with r530415 in particular was that it skipped any symbol
matching CURLOPT, which cut a bunch of useful symbols.

Approved by: sunpoet