Fix an issue where a reference to a deleted row (or column) was not detected properly.

Also adds a test-case for the other problem reported in this bug, but I can't reproduce the bug in that situation.