Added a proper, registered dependency on Baubles. Closes #389 and #381 (probably)