Lots of cross-translation unit messes in here cleaned up finally. This should be the last change necessary to clean up these refs between translation units.
