The provider still has old-style annotation implementations with objects which know how to serialize and parse themselves from strings. Clean this up.