Revert "Var, don't depend on declartaion if @.extra-depends is set"
Revert "Var, don't depend on declartaion if @.extra-depends is set"

This reverts commit 24f5b19abf3ed2a631f32c71ee147dcbcdebab1e.

This broke non-inlined constant to block assignment. If this commit
does actually fix anything then I need to write a test to test what it
fixes.

spitsh/spitsh