This patch is now included in spike/nicklas/distcalc.

/Nicklas