Make dependency inheritance work and simplify the internal represenation of resolved state dependencies (aka "locals") a little