Also refactor servo-dependencies.sls slightly.
Closes #210 (for real this time!)