r2520 Use pointers to compute deltas.
r2521 Due to operator-overloading my previous assumption was wrong.