This is a follow-up to d77501cd Improvements to demand analysis I forgot to remove some now-dead code