diff --git a/include/link/symbol.hpp b/include/link/symbol.hpp
index b625f228..d49e0272 100644
--- a/include/link/symbol.hpp
+++ b/include/link/symbol.hpp
@@ -33,6 +33,9 @@ struct Symbol {
 		int32_t, // Constants just have a numeric value
 		Label // Label values refer to an offset within a specific section
 	> data;
+
+	Label &label();
+	Label const &label() const;
 };
 
 void sym_AddSymbol(Symbol &symbol);
diff --git a/src/link/object.cpp b/src/link/object.cpp
index c24f55da..985c7301 100644
--- a/src/link/object.cpp
+++ b/src/link/object.cpp
@@ -340,11 +340,11 @@ static void readSection(FILE *file, Section &section, char const *fileName,
 static void linkSymToSect(Symbol &symbol, Section &section)
 {
 	uint32_t a = 0, b = section.symbols.size();
-	int32_t symbolOffset = std::get<Label>(symbol.data).offset;
+	int32_t symbolOffset = symbol.label().offset;
 
 	while (a != b) {
 		uint32_t c = (a + b) / 2;
-		int32_t otherOffset = std::get<Label>(section.symbols[c]->data).offset;
+		int32_t otherOffset = section.symbols[c]->label().offset;
 
 		if (otherOffset > symbolOffset)
 			b = c;
diff --git a/src/link/output.cpp b/src/link/output.cpp
index c9e0cb7b..4da596f3 100644
--- a/src/link/output.cpp
+++ b/src/link/output.cpp
@@ -347,7 +347,7 @@ static void writeSymBank(SortedSections const &bankSections, enum SectionType ty
 			if (!sym->name.empty() && canStartSymName(sym->name[0]))
 				symList.push_back({
 					.sym = sym,
-					.addr = (uint16_t)(std::get<Label>(sym->data).offset + sect->org)
+					.addr = (uint16_t)(sym->label().offset + sect->org)
 				});
 		}
 	});
@@ -417,7 +417,7 @@ static void writeMapBank(SortedSections const &sectList, enum SectionType type,
 				for (Symbol *sym : sect->symbols)
 					// Space matches "\tSECTION: $xxxx ..."
 					fprintf(mapFile, "\t         $%04" PRIx32 " = %s\n",
-						std::get<Label>(sym->data).offset + org,
+						sym->label().offset + org,
 						sym->name.c_str());
 
 				if (sect->nextu) {
diff --git a/src/link/patch.cpp b/src/link/patch.cpp
index 86c76360..cc536cbf 100644
--- a/src/link/patch.cpp
+++ b/src/link/patch.cpp
@@ -228,14 +228,14 @@ static int32_t computeRPNExpr(Patch const &patch, std::vector<Symbol> const &fil
 				      fileSymbols[value].name.c_str());
 				isError = true;
 				value = 1;
-			} else if (!std::holds_alternative<Label>(symbol->data)) {
+			} else if (Label const *label = std::get_if<Label>(&symbol->data); label) {
+				value = label->section->bank;
+			} else {
 				error(patch.src, patch.lineNo,
 				      "Requested BANK() of non-label symbol \"%s\"",
 				      fileSymbols[value].name.c_str());
 				isError = true;
 				value = 1;
-			} else {
-				value = std::get<Label>(symbol->data).section->bank;
 			}
 			break;
 
diff --git a/src/link/sdas_obj.cpp b/src/link/sdas_obj.cpp
index f481a167..a1f0a14c 100644
--- a/src/link/sdas_obj.cpp
+++ b/src/link/sdas_obj.cpp
@@ -715,7 +715,7 @@ void sdobj_ReadFile(FileStackNode const &where, FILE *file, std::vector<Symbol>
 		if (section->modifier == SECTION_FRAGMENT) {
 			// Add the fragment's offset to all of its symbols
 			for (Symbol *symbol : section->symbols)
-				std::get<Label>(symbol->data).offset += section->offset;
+				symbol->label().offset += section->offset;
 		}
 	}
 
diff --git a/src/link/symbol.cpp b/src/link/symbol.cpp
index 0e7adeab..a267fa23 100644
--- a/src/link/symbol.cpp
+++ b/src/link/symbol.cpp
@@ -16,6 +16,18 @@
 
 std::map<std::string, Symbol *> symbols;
 
+Label &Symbol::label()
+{
+	assert(std::holds_alternative<Label>(data));
+	return std::get<Label>(data);
+}
+
+Label const &Symbol::label() const
+{
+	assert(std::holds_alternative<Label>(data));
+	return std::get<Label>(data);
+}
+
 void sym_AddSymbol(Symbol &symbol)
 {
 	// Check if the symbol already exists