Prefer using original type over auto upcast in expressions