Minor cleanup to tighten visibility and remove compilation warning.