- Fix expected variant display
- Refrain from array-casting, instead always wrap in array