Eliminate redundant filtering of baseHasUuid.