Composite keys in _get_by_raw_pkval_ not handled correctly