Reorganizing in order to make sense of what Joey D wrote and what I'm
writing.  This way, I should not clobber any of his working code.