Fix StoreP(r,m) and remove scratch reg