:+1: That is exactly what I was doing on my branch. Should be good enough to gradually move stuff over to `Type`.