Branch commit Rewrote resolve to take into account Tagged and Constant Data. Mixing expanded and Tagged does not work yet.