I've got an off-by-one in ExpandGrid that only seems to affect expanding by more than one. I don't know what that is yet.