Merge "Cleaning up calc_frame_boost()."