?+ diffusion and trapping in high purity and oxygen-doped Nb