first push on getting rid of AnnotatedLists.