Fix prepare(dict), separate RowProxy preparation function