Minor cleanup in preparation for merge.