Fixes for new collection code-gen and incorrect DRE data registration.