diff --git a/code/espurna/ifan.cpp b/code/espurna/ifan.cpp
index 02e21033..f6eb6ea2 100644
--- a/code/espurna/ifan.cpp
+++ b/code/espurna/ifan.cpp
@@ -347,7 +347,7 @@ void setup() {
 
 #if TERMINAL_SUPPORT
     terminalRegisterCommand(F("SPEED"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc == 2) {
+        if (ctx.argv.size() == 2) {
             updateSpeedFromPayload(ctx.argv[1]);
         }
 
diff --git a/code/espurna/influxdb.cpp b/code/espurna/influxdb.cpp
index df1090f5..0f4749fd 100644
--- a/code/espurna/influxdb.cpp
+++ b/code/espurna/influxdb.cpp
@@ -306,7 +306,7 @@ void idbSetup() {
 
     #if TERMINAL_SUPPORT
         terminalRegisterCommand(F("IDB.SEND"), [](const terminal::CommandContext& ctx) {
-            if (ctx.argc != 4) {
+            if (ctx.argv.size() != 4) {
                 terminalError(F("idb.send <topic> <id> <value>"));
                 return;
             }
diff --git a/code/espurna/led.cpp b/code/espurna/led.cpp
index 15e9f6f2..98124613 100644
--- a/code/espurna/led.cpp
+++ b/code/espurna/led.cpp
@@ -1030,7 +1030,7 @@ namespace terminal {
 
 void setup() {
     terminalRegisterCommand(F("LED"), [](const ::terminal::CommandContext& ctx) {
-        if (ctx.argc > 1) {
+        if (ctx.argv.size() > 1) {
             size_t id;
             if (!tryParseId(ctx.argv[1].c_str(), ledCount, id)) {
                 terminalError(ctx, F("Invalid ledID"));
@@ -1038,7 +1038,7 @@ void setup() {
             }
 
             auto& led = internal::leds[id];
-            if (ctx.argc > 2) {
+            if (ctx.argv.size() > 2) {
                 led.mode(LedMode::Manual);
                 pattern(led, Pattern(ctx.argv[2]));
             } else {
diff --git a/code/espurna/light.cpp b/code/espurna/light.cpp
index cbbd687f..a53bb837 100644
--- a/code/espurna/light.cpp
+++ b/code/espurna/light.cpp
@@ -2379,7 +2379,7 @@ namespace {
 void _lightInitCommands() {
 
     terminalRegisterCommand(F("LIGHT"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc > 1) {
+        if (ctx.argv.size() > 1) {
             if (!_lightParsePayload(ctx.argv[1].c_str())) {
                 terminalError(ctx, F("Invalid payload"));
                 return;
@@ -2392,7 +2392,7 @@ void _lightInitCommands() {
     });
 
     terminalRegisterCommand(F("BRIGHTNESS"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc > 1) {
+        if (ctx.argv.size() > 1) {
             _lightAdjustBrightness(ctx.argv[1]);
             lightUpdate();
         }
@@ -2416,7 +2416,7 @@ void _lightInitCommands() {
                     String(_light_channels[channel].current, 2).c_str());
         };
 
-        if (ctx.argc > 2) {
+        if (ctx.argv.size() > 2) {
             size_t id;
             if (!_lightTryParseChannel(ctx.argv[1].c_str(), id)) {
                 terminalError(ctx, F("Invalid channel ID"));
@@ -2436,7 +2436,7 @@ void _lightInitCommands() {
     });
 
     terminalRegisterCommand(F("RGB"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc > 1) {
+        if (ctx.argv.size() > 1) {
             _lightFromRgbPayload(ctx.argv[1].c_str());
             lightUpdate();
         }
@@ -2445,7 +2445,7 @@ void _lightInitCommands() {
     });
 
     terminalRegisterCommand(F("HSV"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc > 1) {
+        if (ctx.argv.size() > 1) {
             _lightFromHsvPayload(ctx.argv[1].c_str());
             lightUpdate();
         }
@@ -2454,7 +2454,7 @@ void _lightInitCommands() {
     });
 
     terminalRegisterCommand(F("KELVIN"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc > 1) {
+        if (ctx.argv.size() > 1) {
             _lightAdjustKelvin(ctx.argv[1]);
             lightUpdate();
         }
@@ -2463,7 +2463,7 @@ void _lightInitCommands() {
     });
 
     terminalRegisterCommand(F("MIRED"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc > 1) {
+        if (ctx.argv.size() > 1) {
             _lightAdjustMireds(ctx.argv[1]);
             lightUpdate();
         }
diff --git a/code/espurna/mqtt.cpp b/code/espurna/mqtt.cpp
index 2521f1ae..bb48417e 100644
--- a/code/espurna/mqtt.cpp
+++ b/code/espurna/mqtt.cpp
@@ -800,7 +800,7 @@ void _mqttInitCommands() {
     });
 
     terminalRegisterCommand(F("MQTT.SEND"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc == 3) {
+        if (ctx.argv.size() == 3) {
             if (mqttSend(ctx.argv[1].c_str(), ctx.argv[2].c_str(), false, false)) {
                 terminalOK(ctx);
             } else {
diff --git a/code/espurna/ntp.cpp b/code/espurna/ntp.cpp
index 3ee29d48..23025772 100644
--- a/code/espurna/ntp.cpp
+++ b/code/espurna/ntp.cpp
@@ -647,7 +647,7 @@ void ntpSetup() {
         });
 #else
         terminalRegisterCommand(F("NTP.SETTIME"), [](const terminal::CommandContext& ctx) {
-            if (ctx.argc != 2) {
+            if (ctx.argv.size() != 2) {
                 terminalError(ctx, F("NTP.SETTIME <TIME>"));
                 return;
             }
diff --git a/code/espurna/ota_asynctcp.cpp b/code/espurna/ota_asynctcp.cpp
index 0aa9450d..8619eda7 100644
--- a/code/espurna/ota_asynctcp.cpp
+++ b/code/espurna/ota_asynctcp.cpp
@@ -243,7 +243,7 @@ void clientFromUrl(const String& string) {
 
 void terminalCommands() {
     terminalRegisterCommand(F("OTA"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc == 2) {
+        if (ctx.argv.size() == 2) {
             clientFromUrl(ctx.argv[1]);
             terminalOK(ctx);
             return;
diff --git a/code/espurna/ota_httpupdate.cpp b/code/espurna/ota_httpupdate.cpp
index 0761b9bc..59033c1a 100644
--- a/code/espurna/ota_httpupdate.cpp
+++ b/code/espurna/ota_httpupdate.cpp
@@ -145,7 +145,7 @@ void clientFromUrl(const String& url) {
 
 void terminalCommands() {
     terminalRegisterCommand(F("OTA"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc == 2) {
+        if (ctx.argv.size() == 2) {
             clientFromUrl(ctx.argv[1]);
             terminalOK(ctx);
             return;
diff --git a/code/espurna/relay.cpp b/code/espurna/relay.cpp
index 55ea55cb..9e1291d0 100644
--- a/code/espurna/relay.cpp
+++ b/code/espurna/relay.cpp
@@ -2150,7 +2150,7 @@ void _relayInitCommands() {
             }
         };
 
-        if (ctx.argc == 1) {
+        if (ctx.argv.size() == 1) {
             showRelays(0, _relays.size());
             terminalOK(ctx);
             return;
@@ -2162,7 +2162,7 @@ void _relayInitCommands() {
             return;
         }
 
-        if (ctx.argc > 2) {
+        if (ctx.argv.size() > 2) {
             auto status = relayParsePayload(ctx.argv[2].c_str());
             if (PayloadStatus::Unknown == status) {
                 terminalError(ctx, F("Invalid status"));
diff --git a/code/espurna/rfbridge.cpp b/code/espurna/rfbridge.cpp
index fc0f88a2..6d7a7b6c 100644
--- a/code/espurna/rfbridge.cpp
+++ b/code/espurna/rfbridge.cpp
@@ -1093,7 +1093,7 @@ void _rfbCommandStatusDispatch(const terminal::CommandContext& ctx, size_t id, c
 void _rfbInitCommands() {
 
     terminalRegisterCommand(F("RFB.SEND"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc == 2) {
+        if (ctx.argv.size() == 2) {
             rfbSend(ctx.argv[1]);
             return;
         }
@@ -1103,7 +1103,7 @@ void _rfbInitCommands() {
 
 #if RELAY_SUPPORT
     terminalRegisterCommand(F("RFB.LEARN"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc != 3) {
+        if (ctx.argv.size() != 3) {
             terminalError(ctx, F("RFB.LEARN <ID> <STATUS>"));
             return;
         }
@@ -1118,7 +1118,7 @@ void _rfbInitCommands() {
     });
 
     terminalRegisterCommand(F("RFB.FORGET"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc < 2) {
+        if (ctx.argv.size() < 2) {
             terminalError(ctx, F("RFB.FORGET <ID> [<STATUS>]"));
             return;
         }
@@ -1129,7 +1129,7 @@ void _rfbInitCommands() {
             return;
         }
 
-        if (ctx.argc == 3) {
+        if (ctx.argv.size() == 3) {
             _rfbCommandStatusDispatch(ctx, id, ctx.argv[2], rfbForget);
             return;
         }
@@ -1143,7 +1143,7 @@ void _rfbInitCommands() {
 
 #if RFB_PROVIDER == RFB_PROVIDER_EFM8BB1
     terminalRegisterCommand(F("RFB.WRITE"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc != 2) {
+        if (ctx.argv.size() != 2) {
             terminalError(ctx, F("RFB.WRITE <PAYLOAD>"));
             return;
         }
diff --git a/code/espurna/rpnrules.cpp b/code/espurna/rpnrules.cpp
index 093f7e73..162dbf1f 100644
--- a/code/espurna/rpnrules.cpp
+++ b/code/espurna/rpnrules.cpp
@@ -299,7 +299,7 @@ void setup() {
     });
 
     terminalRegisterCommand(F("RPN.TEST"), [](const ::terminal::CommandContext& ctx) {
-        if (ctx.argc != 2) {
+        if (ctx.argv.size() != 2) {
             terminalError(F("Wrong arguments"));
             return;
         }
diff --git a/code/espurna/sensors/PZEM004TSensor.h b/code/espurna/sensors/PZEM004TSensor.h
index f0a06ba4..219bfb0d 100644
--- a/code/espurna/sensors/PZEM004TSensor.h
+++ b/code/espurna/sensors/PZEM004TSensor.h
@@ -477,7 +477,7 @@ void PZEM004TSensor::registerTerminalCommands() {
         auto it = _ports.begin();
         auto end = _ports.end();
 
-        if (ctx.argc == 2) {
+        if (ctx.argv.size() == 2) {
             auto offset = settings::internal::convert<size_t>(ctx.argv[1]);
             if (offset >= _ports.size()) {
                 terminalError(ctx, F("Invalid port ID"));
@@ -520,7 +520,7 @@ void PZEM004TSensor::registerTerminalCommands() {
     // Set the *currently connected* device address
     // (ref. comment at the top, shouldn't do this when multiple devices are connected)
     terminalRegisterCommand(F("PZ.ADDRESS"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc != 3) {
+        if (ctx.argv.size() != 3) {
             terminalError(ctx, F("PZ.ADDRESS <PORT> <ADDRESS>"));
             return;
         }
diff --git a/code/espurna/sensors/PZEM004TV30Sensor.h b/code/espurna/sensors/PZEM004TV30Sensor.h
index 6b0da7c5..5f3c5333 100644
--- a/code/espurna/sensors/PZEM004TV30Sensor.h
+++ b/code/espurna/sensors/PZEM004TV30Sensor.h
@@ -660,7 +660,7 @@ PZEM004TV30Sensor::PortPtr PZEM004TV30Sensor::_port{};
 void PZEM004TV30Sensor::registerTerminalCommands() {
 #if TERMINAL_SUPPORT
     terminalRegisterCommand(F("PZ.ADDRESS"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc != 2) {
+        if (ctx.argv.size() != 2) {
             terminalError(ctx.output, F("PZ.ADDRESS <ADDRESS>"));
             return;
         }
diff --git a/code/espurna/settings.cpp b/code/espurna/settings.cpp
index 7d236b5b..5808e722 100644
--- a/code/espurna/settings.cpp
+++ b/code/espurna/settings.cpp
@@ -523,7 +523,7 @@ void _settingsInitCommands() {
     });
 
     terminalRegisterCommand(F("DEL"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc < 2) {
+        if (ctx.argv.size() < 2) {
             terminalError(ctx, F("del <key> [<key>...]"));
             return;
         }
@@ -541,7 +541,7 @@ void _settingsInitCommands() {
     });
 
     terminalRegisterCommand(F("SET"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc != 3) {
+        if (ctx.argv.size() != 3) {
             terminalError(ctx, F("set <key> <value>"));
             return;
         }
@@ -555,7 +555,7 @@ void _settingsInitCommands() {
     });
 
     terminalRegisterCommand(F("GET"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc < 2) {
+        if (ctx.argv.size() < 2) {
             terminalError(ctx, F("get <key> [<key>...]"));
             return;
         }
diff --git a/code/espurna/storage_eeprom.cpp b/code/espurna/storage_eeprom.cpp
index fa1ec448..ec656277 100644
--- a/code/espurna/storage_eeprom.cpp
+++ b/code/espurna/storage_eeprom.cpp
@@ -95,7 +95,7 @@ void _eepromInitCommands() {
     });
 
     terminalRegisterCommand(F("FLASH.DUMP"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc < 2) {
+        if (ctx.argv.size() < 2) {
             terminalError(F("Wrong arguments"));
             return;
         }
diff --git a/code/espurna/telnet.cpp b/code/espurna/telnet.cpp
index a7e0f51d..5740d258 100644
--- a/code/espurna/telnet.cpp
+++ b/code/espurna/telnet.cpp
@@ -562,7 +562,7 @@ void telnetSetup() {
 
         #if TERMINAL_SUPPORT
             terminalRegisterCommand(F("TELNET.REVERSE"), [](const terminal::CommandContext& ctx) {
-                if (ctx.argc < 3) {
+                if (ctx.argv.size() < 3) {
                     terminalError(F("Wrong arguments. Usage: TELNET.REVERSE <host> <port>"));
                     return;
                 }
diff --git a/code/espurna/terminal.cpp b/code/espurna/terminal.cpp
index 87f0486a..529f6d6c 100644
--- a/code/espurna/terminal.cpp
+++ b/code/espurna/terminal.cpp
@@ -357,7 +357,7 @@ void _terminalInitCommands() {
     });
 
     terminalRegisterCommand(F("ADC"), [](const terminal::CommandContext& ctx) {
-        const int pin = (ctx.argc == 2)
+        const int pin = (ctx.argv.size() == 2)
             ? ctx.argv[1].toInt()
             : A0;
 
@@ -366,7 +366,7 @@ void _terminalInitCommands() {
     });
 
     terminalRegisterCommand(F("GPIO"), [](const terminal::CommandContext& ctx) {
-        const int pin = (ctx.argc >= 2)
+        const int pin = (ctx.argv.size() >= 2)
             ? ctx.argv[1].toInt()
             : -1;
 
@@ -378,7 +378,7 @@ void _terminalInitCommands() {
         int start = 0;
         int end = gpioPins();
 
-        switch (ctx.argc) {
+        switch (ctx.argv.size()) {
         case 3:
             pinMode(pin, OUTPUT);
             digitalWrite(pin, (1 == ctx.argv[2].toInt()));
@@ -478,7 +478,7 @@ void _terminalInitCommands() {
 
     terminalRegisterCommand(F("RESET"), [](const terminal::CommandContext& ctx) {
         auto count = 1;
-        if (ctx.argc == 2) {
+        if (ctx.argv.size() == 2) {
             count = ctx.argv[1].toInt();
             if (count < SYSTEM_CHECK_MAX) {
                 systemStabilityCounter(count);
@@ -496,7 +496,7 @@ void _terminalInitCommands() {
 
 #if SECURE_CLIENT == SECURE_CLIENT_BEARSSL
     terminalRegisterCommand(F("MFLN.PROBE"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc != 3) {
+        if (ctx.argv.size() != 3) {
             terminalError(ctx, F("<url> <value>"));
             return;
         }
@@ -517,7 +517,7 @@ void _terminalInitCommands() {
 #endif
 
     terminalRegisterCommand(F("HOST"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc != 2) {
+        if (ctx.argv.size() != 2) {
             terminalError(ctx, F("<hostname>"));
             return;
         }
diff --git a/code/espurna/terminal_commands.cpp b/code/espurna/terminal_commands.cpp
index ad45dce3..ca76cb96 100644
--- a/code/espurna/terminal_commands.cpp
+++ b/code/espurna/terminal_commands.cpp
@@ -79,7 +79,7 @@ Terminal::Result Terminal::processLine() {
             // parser should pick out at least one arg aka command
             auto cmdline = parsing::parse_commandline(_buffer.data());
             _buffer.clear();
-            if ((cmdline.argc >= 1) && (cmdline.argv[0].length())) {
+            if ((cmdline.argv.size() >= 1) && (cmdline.argv[0].length())) {
                 auto found = std::find_if(_commands.begin(), _commands.end(), [&cmdline](const Command& command) {
                     // note that `String::equalsIgnoreCase(const __FlashStringHelper*)` does not exist, and will create a temporary `String`
                     // both use read-1-byte-at-a-time for PROGMEM, however this variant saves around 200μs in time since there's no temporary object
@@ -90,7 +90,7 @@ Terminal::Result Terminal::processLine() {
                     return (cmdline.argv[0].length() == len) && (0 == strncasecmp_P(lhs, rhs, len));
                 });
                 if (found == _commands.end()) return Result::CommandNotFound;
-                (*found).second(CommandContext{std::move(cmdline.argv), cmdline.argc, _stream});
+                (*found).second(CommandContext{std::move(cmdline.argv), _stream});
                 return Result::Command;
             }
         }
diff --git a/code/espurna/terminal_commands.h b/code/espurna/terminal_commands.h
index 17b58218..bc9ea35f 100644
--- a/code/espurna/terminal_commands.h
+++ b/code/espurna/terminal_commands.h
@@ -24,7 +24,6 @@ struct Terminal;
 // Like Embedis implementation, we only pass things that we actually use instead of complete obj instance
 struct CommandContext {
     std::vector<String> argv;
-    size_t argc;
     Print& output;
 };
 
diff --git a/code/espurna/terminal_parsing.cpp b/code/espurna/terminal_parsing.cpp
index 6cbfce9c..d95f78e2 100644
--- a/code/espurna/terminal_parsing.cpp
+++ b/code/espurna/terminal_parsing.cpp
@@ -196,8 +196,7 @@ CommandLine parse_commandline(const char *line) {
 err:
     argv.clear();
 out:
-    size_t argc = argv.size();
-    return CommandLine{std::move(argv), argc};
+    return CommandLine{std::move(argv)};
 }
 
 // Fowler–Noll–Vo hash function to hash command strings that treats input as lowercase
diff --git a/code/espurna/terminal_parsing.h b/code/espurna/terminal_parsing.h
index 51ad9004..0d8f9f9e 100644
--- a/code/espurna/terminal_parsing.h
+++ b/code/espurna/terminal_parsing.h
@@ -17,15 +17,13 @@ namespace parsing {
 
 // Generic command line parser
 // - split each arg from the input line and put them into the argv array
-// - argc is expected to be equal to the argv
-using Argv = std::vector<String>;
-
+// - argc is expected to be equal to the argv.size()
 struct CommandLine {
+    using Argv = std::vector<String>;
     Argv argv;
-    size_t argc;
 };
 
-CommandLine parse_commandline(const char *line);
+CommandLine parse_commandline(const char* line);
 
 } // namespace parsing
 } // namespace terminal
diff --git a/code/test/unit/terminal/terminal.cpp b/code/test/unit/terminal/terminal.cpp
index 7a40c064..9b758913 100644
--- a/code/test/unit/terminal/terminal.cpp
+++ b/code/test/unit/terminal/terminal.cpp
@@ -42,7 +42,7 @@ void test_hex_codes() {
     static bool abc_done = false;
 
     terminal::Terminal::addCommand(F("abc"), [](const terminal::CommandContext& ctx) {
-        TEST_ASSERT_EQUAL(2, ctx.argc);
+        TEST_ASSERT_EQUAL(2, ctx.argv.size());
         TEST_ASSERT_EQUAL_STRING("abc", ctx.argv[0].c_str());
         TEST_ASSERT_EQUAL_STRING("abc", ctx.argv[1].c_str());
         abc_done = true;
@@ -69,17 +69,17 @@ void test_multiple_commands() {
     static int command_calls = 0;
 
     terminal::Terminal::addCommand(F("test1"), [](const terminal::CommandContext& ctx) {
-        TEST_ASSERT_EQUAL_MESSAGE(1, ctx.argc, "Command without args should have argc == 1");
+        TEST_ASSERT_EQUAL_MESSAGE(1, ctx.argv.size(), "Command without args should have argc == 1");
         TEST_ASSERT_EQUAL(0, command_calls);
         command_calls = 1;
     });
     terminal::Terminal::addCommand(F("test2"), [](const terminal::CommandContext& ctx) {
-        TEST_ASSERT_EQUAL_MESSAGE(1, ctx.argc, "Command without args should have argc == 1");
+        TEST_ASSERT_EQUAL_MESSAGE(1, ctx.argv.size(), "Command without args should have argc == 1");
         TEST_ASSERT_EQUAL(1, command_calls);
         command_calls = 2;
     });
     terminal::Terminal::addCommand(F("test3"), [](const terminal::CommandContext& ctx) {
-        TEST_ASSERT_EQUAL_MESSAGE(1, ctx.argc, "Command without args should have argc == 1");
+        TEST_ASSERT_EQUAL_MESSAGE(1, ctx.argv.size(), "Command without args should have argc == 1");
         TEST_ASSERT_EQUAL(2, command_calls);
         command_calls = 3;
     });
@@ -114,7 +114,7 @@ void test_command() {
     static int counter = 0;
 
     terminal::Terminal::addCommand(F("test.command"), [](const terminal::CommandContext& ctx) {
-        TEST_ASSERT_EQUAL_MESSAGE(1, ctx.argc, "Command without args should have argc == 1");
+        TEST_ASSERT_EQUAL_MESSAGE(1, ctx.argv.size(), "Command without args should have argc == 1");
         ++counter;
     });
 
@@ -151,12 +151,12 @@ void test_command_args() {
     static bool waiting = false;
 
     terminal::Terminal::addCommand(F("test.command.arg1"), [](const terminal::CommandContext& ctx) {
-        TEST_ASSERT_EQUAL(2, ctx.argc);
+        TEST_ASSERT_EQUAL(2, ctx.argv.size());
         waiting = false;
     });
 
     terminal::Terminal::addCommand(F("test.command.arg1_empty"), [](const terminal::CommandContext& ctx) {
-        TEST_ASSERT_EQUAL(2, ctx.argc);
+        TEST_ASSERT_EQUAL(2, ctx.argv.size());
         TEST_ASSERT(!ctx.argv[1].length());
         waiting = false;
     });
@@ -236,7 +236,7 @@ void test_case_insensitive() {
 void test_output() {
 
     terminal::Terminal::addCommand(F("test.output"), [](const terminal::CommandContext& ctx) {
-        if (ctx.argc != 2) return;
+        if (ctx.argv.size() != 2) return;
         ctx.output.print(ctx.argv[1]);
     });