Minor cleanup
Make hierarchy locking a concern of Dependency, not the executor