Re-add support for Struct
Remove EV coercers