We now look up variable names here, so update this. Also drop the other (no longer necessary) mappings.