Command block minecart data walker never runs due to comparing different types

Command block minecarts have the following data walker:

if ("minecraft:command_block".equals(new ResourceLocation(compound.getString("id"))))
{
    compound.setString("id", "Control");
    fixer.process(FixTypes.BLOCK_ENTITY, compound, versionIn);
    compound.setString("id", "MinecartCommandBlock");
}

return compound;

if ("minecraft:command_block".equals(new ResourceLocation(compound.getString("id"))))
{
    compound.setString("id", "Control");
    fixer.process(FixTypes.BLOCK_ENTITY, compound, versionIn);
    compound.setString("id", "MinecartCommandBlock");
}

return compound;

This will never run, because it is comparing a String constant with a resource location. (This issue was introduced in 18w01a). This is not an issue for spawner minecarts, which use if (Objects.equals("minecraft:spawner_minecart", (new ResourceLocation(s)).toString())).

The code also seems to be using old (pre-1.11) IDs, which is incorrect; see MC-116928.