diff --git a/Code/Libs/ODC/IOTypesJSON.cpp b/Code/Libs/ODC/IOTypesJSON.cpp
index 2cc01f24..cbc3d4fd 100644
--- a/Code/Libs/ODC/IOTypesJSON.cpp
+++ b/Code/Libs/ODC/IOTypesJSON.cpp
@@ -261,7 +261,9 @@ template<> ControlRelayOutputBlock PayloadFromJson(const Json::Value& JLoad)
 	ControlRelayOutputBlock CROB;
 	if(JLoad["ControlCode"].isUInt())
 		CROB.functionCode = static_cast<ControlCode>(JLoad["ControlCode"].asUInt()&0xFF);
-	else if(!JLoad["ControlCode"].isString() || !ToControlCode(JLoad["ControlCode"].asString(),CROB.functionCode))
+	else if(JLoad["ControlCode"].isString())
+		CROB.functionCode = ControlCodeFromString(JLoad["ControlCode"].asString());
+	else
 		throw std::invalid_argument("Payload 'ControlCode' is not unsigned integer or valid string.");
 
 	if(JLoad.isMember("CommandStatus"))
@@ -401,10 +403,12 @@ template<> ConnectState PayloadFromJson(const Json::Value& JLoad)
 		return static_cast<ConnectState>(JLoad.asUInt());
 	}
 
-	ConnectState CS;
-	if(JLoad.isString() && GetConnectStateFromStringName(JLoad.asString(),CS))
-		return CS;
-
+	if(JLoad.isString())
+	{
+		ConnectState CS = ConnectStateFromString(JLoad.asString());
+		if(CS != ConnectState::UNDEFINED)
+			return CS;
+	}
 	throw std::invalid_argument("Payload not convertable to odc::ConnectState.");
 }
 
diff --git a/Code/Ports/PyPort/PyPort.cpp b/Code/Ports/PyPort/PyPort.cpp
index fd045237..373170fd 100644
--- a/Code/Ports/PyPort/PyPort.cpp
+++ b/Code/Ports/PyPort/PyPort.cpp
@@ -354,8 +354,8 @@ std::shared_ptr<odc::EventInfo> PyPort::CreateEventFromStrParams(const std::stri
 	{
 		case EventType::ConnectState:
 		{
-			ConnectState state; // PORT_UP,CONNECTED,DISCONNECTED,PORT_DOWN
-			if (!GetConnectStateFromStringName(PayloadStr, state))
+			ConnectState state = ConnectStateFromString(PayloadStr);
+			if (state == ConnectState::UNDEFINED)
 			{
 				LOGERROR("Invalid Connection State passed from Python Code to ODC - {}", PayloadStr);
 				return nullptr;
@@ -406,8 +406,8 @@ std::shared_ptr<odc::EventInfo> PyPort::CreateEventFromStrParams(const std::stri
 				auto Parts = split(PayloadStr, '|');
 				if (Parts.size() != 5) throw std::runtime_error("Payload for ControlRelayOutputBlock does not have enough sections " + PayloadStr);
 
-				ControlCode ControlCodeResult;
-				ToControlCode(Parts[1], ControlCodeResult);
+				ControlCode ControlCodeResult = ControlCodeFromString(Parts[1]);
+				if(ControlCodeResult == ControlCode::UNDEFINED) throw std::runtime_error("ControlCode field of ControlRelayOutputBlock not in " + Parts[1]);
 				val.functionCode = ControlCodeResult;
 
 				if (Parts[2].find("Count") == std::string::npos) throw std::runtime_error("Count field of ControlRelayOutputBlock not in " + Parts[2]);
diff --git a/Code/Ports/SimPort/SimPort.cpp b/Code/Ports/SimPort/SimPort.cpp
index 41f37005..8716b773 100644
--- a/Code/Ports/SimPort/SimPort.cpp
+++ b/Code/Ports/SimPort/SimPort.cpp
@@ -708,7 +708,7 @@ void SimPort::Build()
 				std::string error = "";
 
 				if (parameters.count("type") != 0)
-					type = ToEventType(parameters.at("type"));
+					type = EventTypeFromString(parameters.at("type"));
 				else
 					error = "No 'type' parameter found";
 
diff --git a/Code/Ports/SimPort/SimPortCollection.h b/Code/Ports/SimPort/SimPortCollection.h
index e4c1689a..59130fc5 100644
--- a/Code/Ports/SimPort/SimPortCollection.h
+++ b/Code/Ports/SimPort/SimPortCollection.h
@@ -51,7 +51,7 @@ class SimPortCollection: public ResponderMap< std::weak_ptr<SimPort> >
 				{
 					return IUIResponder::GenerateResult("Bad parameter");
 				}
-				auto type = ToEventType(params.at("0"));
+				auto type = EventTypeFromString(params.at("0"));
 				auto index = params.at("1");
 				auto period = params.at("2");
 				if(target->UISetUpdateInterval(type,index,period))
@@ -119,7 +119,7 @@ class SimPortCollection: public ResponderMap< std::weak_ptr<SimPort> >
 				{
 					return IUIResponder::GenerateResult("Bad parameter");
 				}
-				auto type = ToEventType(params.at("0"));
+				auto type = EventTypeFromString(params.at("0"));
 				auto index = params.at("1");
 				if(target->UIRelease(type,index))
 					return IUIResponder::GenerateResult("Success");
@@ -148,7 +148,7 @@ class SimPortCollection: public ResponderMap< std::weak_ptr<SimPort> >
 		{
 			return IUIResponder::GenerateResult("Bad parameter");
 		}
-		auto type = ToEventType(params.at("0"));
+		auto type = EventTypeFromString(params.at("0"));
 		auto index = params.at("1");
 		auto value = params.at("2");
 		std::string quality = "";
diff --git a/Code/tests/DNP3Port_tests/TestDNP3EventHandling.cpp b/Code/tests/DNP3Port_tests/TestDNP3EventHandling.cpp
index aacd3692..af557f52 100644
--- a/Code/tests/DNP3Port_tests/TestDNP3EventHandling.cpp
+++ b/Code/tests/DNP3Port_tests/TestDNP3EventHandling.cpp
@@ -192,10 +192,8 @@ void CheckPointDB(const std::shared_ptr<DataPort>& port, const std::vector<Paylo
 							payload_as_expected = true;
 							break;
 						}
-						if constexpr(ET == EventType::OctetString)
+						if constexpr(ET == EventType::OctetString || ET == EventType::ControlRelayOutputBlock)
 							UNSCOPED_INFO("Payload is " << ToString(payload) << ", expected " << ToString(expected_payload));
-						else if constexpr(ET == EventType::ControlRelayOutputBlock)
-							UNSCOPED_INFO("Payload is " << std::string(payload) << ", expected " << std::string(expected_payload));
 						else
 							UNSCOPED_INFO("Payload is " << payload << ", expected " << expected_payload);
 					}
diff --git a/include/opendatacon/IOTypes.h b/include/opendatacon/IOTypes.h
index fd0c5b9c..2685e0d0 100644
--- a/include/opendatacon/IOTypes.h
+++ b/include/opendatacon/IOTypes.h
@@ -320,8 +320,12 @@ inline bool operator!=(const ControlRelayOutputBlock& lhs, const ControlRelayOut
 {
 	return !(lhs == rhs);
 }
+inline std::string ToString(const ControlRelayOutputBlock& crob)
+{
+	return std::string(crob);
+}
 
-enum class ConnectState {PORT_UP,CONNECTED,DISCONNECTED,PORT_DOWN};
+enum class ConnectState {PORT_UP,CONNECTED,DISCONNECTED,PORT_DOWN,UNDEFINED};
 inline std::string ToString(const ConnectState cs)
 {
 	ENUMSTRING(cs, ConnectState, PORT_UP)
@@ -351,89 +355,64 @@ inline QualityFlags QualityFlagsFromString(const std::string& StrQuality)
 	return QualityResult;
 }
 
+#define CHECKENUMSTRING(S,C,X) if (S == #X) return C::X
+
 inline CommandStatus CommandStatusFromString(const std::string& StrCommandStatus)
 {
-	#define CHECKCSSTRING(C,X) if (StrCommandStatus == #X) return C::X
-	CHECKCSSTRING(CommandStatus,SUCCESS);
-	CHECKCSSTRING(CommandStatus,TIMEOUT);
-	CHECKCSSTRING(CommandStatus,NO_SELECT);
-	CHECKCSSTRING(CommandStatus,FORMAT_ERROR);
-	CHECKCSSTRING(CommandStatus,NOT_SUPPORTED);
-	CHECKCSSTRING(CommandStatus,ALREADY_ACTIVE);
-	CHECKCSSTRING(CommandStatus,HARDWARE_ERROR);
-	CHECKCSSTRING(CommandStatus,LOCAL);
-	CHECKCSSTRING(CommandStatus,TOO_MANY_OPS);
-	CHECKCSSTRING(CommandStatus,NOT_AUTHORIZED);
-	CHECKCSSTRING(CommandStatus,AUTOMATION_INHIBIT);
-	CHECKCSSTRING(CommandStatus,PROCESSING_LIMITED);
-	CHECKCSSTRING(CommandStatus,OUT_OF_RANGE);
-	CHECKCSSTRING(CommandStatus,DOWNSTREAM_LOCAL);
-	CHECKCSSTRING(CommandStatus,ALREADY_COMPLETE);
-	CHECKCSSTRING(CommandStatus,BLOCKED);
-	CHECKCSSTRING(CommandStatus,CANCELLED);
-	CHECKCSSTRING(CommandStatus,BLOCKED_OTHER_MASTER);
-	CHECKCSSTRING(CommandStatus,DOWNSTREAM_FAIL);
-	CHECKCSSTRING(CommandStatus,NON_PARTICIPATING);
-	CHECKCSSTRING(CommandStatus,UNDEFINED);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,SUCCESS);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,TIMEOUT);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,NO_SELECT);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,FORMAT_ERROR);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,NOT_SUPPORTED);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,ALREADY_ACTIVE);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,HARDWARE_ERROR);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,LOCAL);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,TOO_MANY_OPS);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,NOT_AUTHORIZED);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,AUTOMATION_INHIBIT);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,PROCESSING_LIMITED);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,OUT_OF_RANGE);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,DOWNSTREAM_LOCAL);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,ALREADY_COMPLETE);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,BLOCKED);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,CANCELLED);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,BLOCKED_OTHER_MASTER);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,DOWNSTREAM_FAIL);
+	CHECKENUMSTRING(StrCommandStatus,CommandStatus,NON_PARTICIPATING);
 	return CommandStatus::UNDEFINED;
 }
 
-inline EventType EventTypeFromString(const std::string StrEventType)
+inline EventType EventTypeFromString(const std::string& StrEventType)
 {
 	auto EventTypeResult = EventType::BeforeRange;
 	do
 	{
 		EventTypeResult = EventTypeResult+1;
-		auto FindStr = ToString(EventTypeResult);
-		if(FindStr.length() > StrEventType.length())
-			continue;
-		if (StrEventType.find(FindStr, StrEventType.length()-FindStr.length()) != std::string::npos)
+		if (StrEventType == ToString(EventTypeResult))
 			break;
 	} while (EventTypeResult != EventType::AfterRange);
 	return EventTypeResult;
 }
 
-//FIXME: this is an anti-pattern. Should be
-// ControlCodeFromString(), returning a ControlCode, UNDEFINED if not found
-inline bool ToControlCode(const std::string StrControlCode, ControlCode& ControlCodeResult)
+inline ControlCode ControlCodeFromString(const std::string& StrControlCode)
 {
-	#define CHECKCONTROLCODESTRING(X) if (StrControlCode.find(ToString(X)) != std::string::npos) ControlCodeResult = X
-
-	ControlCodeResult = ControlCode::UNDEFINED;
-
-	CHECKCONTROLCODESTRING(ControlCode::CLOSE_PULSE_ON);
-	CHECKCONTROLCODESTRING(ControlCode::LATCH_OFF);
-	CHECKCONTROLCODESTRING(ControlCode::LATCH_ON);
-	CHECKCONTROLCODESTRING(ControlCode::NUL);
-	CHECKCONTROLCODESTRING(ControlCode::PULSE_OFF);
-	CHECKCONTROLCODESTRING(ControlCode::PULSE_ON);
-	CHECKCONTROLCODESTRING(ControlCode::TRIP_PULSE_ON);
-
-	return (ControlCodeResult != ControlCode::UNDEFINED);
-}
-
-//FIXME: this is an anti-pattern. Should be
-// ConnectStateFromString(), returning a ConnectState, UNDEFINED if not found
-inline bool GetConnectStateFromStringName(const std::string StrConnectState, ConnectState& ConnectStateResult)
-{
-	#define CHECKCONNECTSTATESTRING(X) if (StrConnectState.find(ToString(X)) != std::string::npos) {ConnectStateResult = X;return true;}
-
-	CHECKCONNECTSTATESTRING(ConnectState::CONNECTED);
-	CHECKCONNECTSTATESTRING(ConnectState::DISCONNECTED);
-	CHECKCONNECTSTATESTRING(ConnectState::PORT_DOWN);
-	CHECKCONNECTSTATESTRING(ConnectState::PORT_UP);
-
-	return false;
+	CHECKENUMSTRING(StrControlCode,ControlCode,CLOSE_PULSE_ON);
+	CHECKENUMSTRING(StrControlCode,ControlCode,LATCH_OFF);
+	CHECKENUMSTRING(StrControlCode,ControlCode,LATCH_ON);
+	CHECKENUMSTRING(StrControlCode,ControlCode,NUL);
+	CHECKENUMSTRING(StrControlCode,ControlCode,PULSE_OFF);
+	CHECKENUMSTRING(StrControlCode,ControlCode,PULSE_ON);
+	CHECKENUMSTRING(StrControlCode,ControlCode,TRIP_PULSE_ON);
+	return ControlCode::UNDEFINED;
 }
 
-inline EventType ToEventType(const std::string& str_type)
+inline ConnectState ConnectStateFromString(const std::string StrConnectState)
 {
-	EventType type = EventType::BeforeRange;
-	if (to_lower(str_type) == "binary")
-		type = EventType::Binary;
-	else if (to_lower(str_type) == "analog")
-		type = EventType::Analog;
-	return type;
+	CHECKENUMSTRING(StrConnectState,ConnectState,CONNECTED);
+	CHECKENUMSTRING(StrConnectState,ConnectState,DISCONNECTED);
+	CHECKENUMSTRING(StrConnectState,ConnectState,PORT_DOWN);
+	CHECKENUMSTRING(StrConnectState,ConnectState,PORT_UP);
+	return ConnectState::UNDEFINED;
 }
 
 //Map EventTypes to payload types