Finish transition to string-based types.
Note: ID's are still useable