Upgrade M/R, move appId factories.
Use raw compatibility lookup.