Attempt to resolve strange intra-project dependency issues.