Make dependency to router explicit.

Does not vaporize hackiness.