HideIfDef mode bug fixes and enhancements. This is #2 of 3 patches based