Refactoring some language.  Introducing "Clumps" and "canopies."