Minor terms missing for off-diagonal derivative calculations

[zerothi]

Describe the bug
See the details here: https://doi.org/10.1103/PhysRevB.98.115115

We miss a small contribution to the off-diagonal based on the position matrix.

However, the position matrix+expectation should be trivially handled.