EmbedMany with a discriminatorMap

WIP fix for `preLoad` filtering on `EmbedMany` with a `discriminatorMap`.

Note; includes some cs fixes to the entire repo.