2 files changed, 5 insertions, 8 deletions
diff --git a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
index 036a2b87692..3d15d09814f 100644
--- a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
+++ b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
@@ -43,8 +43,7 @@ PersistenceProvider::UP getSpi(ConformanceTest::PersistenceFactory &factory,
 enum SELECTION_FIELDS
 {
     METADATA_ONLY = 0,
-    FIELDS_HEADER = 1,
-    FIELDS_BODY   = 2
+    ALL_FIELDS = 1
 };
 
 CreateIteratorResult
@@ -52,13 +51,11 @@ createIterator(PersistenceProvider& spi,
                const Bucket& b,
                const Selection& sel,
                IncludedVersions versions = NEWEST_DOCUMENT_ONLY,
-               int fields = FIELDS_HEADER | FIELDS_BODY)
+               int fields = ALL_FIELDS)
 {
     document::FieldSet::UP fieldSet;
-    if (fields & FIELDS_BODY) {
+    if (fields & ALL_FIELDS) {
         fieldSet.reset(new document::AllFields());
-    } else if (fields & FIELDS_HEADER) {
-        fieldSet.reset(new document::HeaderFields());
     } else {
         fieldSet.reset(new document::DocIdOnly());
     }
diff --git a/persistence/src/vespa/persistence/spi/bucket.h b/persistence/src/vespa/persistence/spi/bucket.h
index 874074d7e24..175aba376a9 100644
--- a/persistence/src/vespa/persistence/spi/bucket.h
+++ b/persistence/src/vespa/persistence/spi/bucket.h
@@ -24,8 +24,8 @@ class Bucket {
     PartitionId _partition;
 
 public:
-    Bucket() : _bucket(document::BucketSpace::invalid(), document::BucketId(0)), _partition(0) {}
-    Bucket(const document::Bucket& b, PartitionId p)
+    Bucket() noexcept : _bucket(document::BucketSpace::invalid(), document::BucketId(0)), _partition(0) {}
+    Bucket(const document::Bucket& b, PartitionId p) noexcept
         : _bucket(b), _partition(p) {}
 
     const document::Bucket &getBucket() const { return _bucket; }