Noted a bug that we currently fail to replay overridden mappings correctly, if they were <expr> mappings.