c++: Fix return type deduction during satisfaction