Added support for indirect forwarding for the new change forwarding
implementation.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>