Yes, a strange wave of déjà vu did waft in my general direction when I rewrote those bits. Now I know why :-)

Update: Yet Another Version :-)