Merge "Cleaning up calculate_modified_err()."