Eliminate circular require from 2 supporting files.

To resolve #199 RE circular requires.