New internal annotations: Todo and NotYetImplemented.
Simplify type annotation selectors.