2 files changed, 23 insertions, 20 deletions
diff --git a/libsolidity/analysis/SemVerHandler.cpp b/libsolidity/analysis/SemVerHandler.cpp
index 42186396..29f6d5de 100644
--- a/libsolidity/analysis/SemVerHandler.cpp
+++ b/libsolidity/analysis/SemVerHandler.cpp
@@ -106,18 +106,22 @@ bool SemVerMatchExpression::MatchComponent::matches(SemVerVersion const& _versio
 			}
 		if (cmp == 0 && !_version.prerelease.empty() && didCompare)
 			cmp = -1;
-		if (prefix == Token::Assign)
+
+		switch (prefix)
+		{
+		case Token::Assign:
 			return cmp == 0;
-		else if (prefix == Token::LessThan)
+		case Token::LessThan:
 			return cmp < 0;
-		else if (prefix == Token::LessThanOrEqual)
+		case Token::LessThanOrEqual:
 			return cmp <= 0;
-		else if (prefix == Token::GreaterThan)
+		case Token::GreaterThan:
 			return cmp > 0;
-		else if (prefix == Token::GreaterThanOrEqual)
+		case Token::GreaterThanOrEqual:
 			return cmp >= 0;
-		else
+		default:
 			solAssert(false, "Invalid SemVer expression");
+		}
 		return false;
 	}
 }
@@ -196,21 +200,22 @@ SemVerMatchExpression::MatchComponent SemVerMatchExpressionParser::parseMatchCom
 {
 	SemVerMatchExpression::MatchComponent component;
 	Token::Value token = currentToken();
-	if (
-		token == Token::BitXor ||
-		token == Token::BitNot ||
-		token == Token::LessThan ||
-		token == Token::LessThanOrEqual||
-		token == Token::GreaterThan ||
-		token == Token::GreaterThanOrEqual ||
-		token == Token::Assign
-	)
+
+	switch (token)
 	{
+	case Token::BitXor:
+	case Token::BitNot:
+	case Token::LessThan:
+	case Token::LessThanOrEqual:
+	case Token::GreaterThan:
+	case Token::GreaterThanOrEqual:
+	case Token::Assign:
 		component.prefix = token;
 		nextToken();
-	}
-	else
+		break;
+	default:
 		component.prefix = Token::Assign;
+	}
 
 	component.levelsPresent = 0;
 	while (component.levelsPresent < 3)
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 3056561b..c42a0068 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1778,9 +1778,7 @@ bool TypeChecker::visit(FunctionCall const& _functionCall)
 			}
 			if (resultType->category() == Type::Category::Address)
 			{
-				bool payable = true;
-				if (auto const* contractType = dynamic_cast<ContractType const*>(argType.get()))
-					payable = contractType->isPayable();
+				bool payable = argType->isExplicitlyConvertibleTo(AddressType::addressPayable());
 				resultType = make_shared<AddressType>(payable ? StateMutability::Payable : StateMutability::NonPayable);
 			}
 		}