Fix noun phrases that receive a descriptor.
Words test cleanup. I should add descriptors...
Zone keywords shouldn't be class-only, and misc.