Merge "Cleaning up optimize_b()."