Merge "Rewrite retrieval of resolved classes."