As for migrating into a v2 addon, the `instanceof` checks have been replaced with duck-type testing, due to embroider-build/ember-auto-import#503 Once the mentioned issue is solved, this can be reworked, by searching the code for links to this issue