There is no need to "expand" again the scope we get from invoking `resolve'.
(cherry picked from commit c72c84d8)