Merge "Clean up class resolution and lookup."