LOTS of additions and removals, which compile.  Phew.