Proper handling of dependencies. (Related to #26.)