Consistent order of dependencies
Deal with dynamic objects
Fixes #896
Some bookish config.