Slight cleanup to get in line with upstream v2.4.6