Fix for define bug that was causing creation of huge certificate and expansion files.

Note: Normally I would run a regression before checking in such a
change, but this is a serious bug so I'm getting it in now.  I've done
a few tests, and it looks good.  I'll run a full regression shortly.