Move FIXME to correct place
Move isResolved logic to Dependencies private class.