Correct macro guard
Correct EOPInputType macro definition
Updated make_pair calls to disambiguate type deduction when it is called with an expression