Better type recognition for expect() extended arguments