Continuing work on fixing Glenn's changes to work universally.
Continued work on fixing Glenn's changes.