Add another TODO for deferred dependency in core.