Update type-coercions to @vocab where it makes sense