Merge "calculate_modified_err() cleanup."