WIP: Update to use direct deps. instead of peer deps.

Fix SLN-1055
Fix SLN-1057
or a comment saying under what conditions this can happen, so I know why it isn't logged, maybe it just means npm is busted?