Hello,

This follows on from the elimination of store_address().

I'll commit tomorrow.
Andrew