Manually find and resolve dependencies between existing modules.

Add TODOs for discovered "optional" dependencies.