Some refactoring.  A "new annotation" bug fix.