Sync up dependencies and dependants after dissection, fixes #879.

#879