Adapt to new never type fallback by explicitly stating unit types

Adapt to new never type fallback by explicitly stating unit types #6830