Merge "Small optimization improvements."