Merge "Optimize leaf methods."