Merge "Code refactoring around sharpening HLoadClass."