Incrementally add dependencies via the loader and some merges from master.