Comment 2 for bug 324724

I've attached a branch that fixes this problem, but causes the test_reference_wont_touch_store_when_key_is_unset test to fail.

I am not convinced that the behaviour that test checks is desirable though, so the fix might be to remove that test.