HSEARCH-1573 Take into account @ContainedIn annotations even if there is
no corresponding @IndexedEmbedded

Use a builder as suggested by Hardy.