Cleanup to fix a compilation bug.