Pass more cases
Complete dict for PString
Complete dict for PNumber.
Switch to applyFunc. Trying to get prim-keys working. On leave commit