diff --git a/lib/system/embedded.nim b/lib/system/embedded.nim
index fad9722c2..85fe17f8d 100644
--- a/lib/system/embedded.nim
+++ b/lib/system/embedded.nim
@@ -15,14 +15,14 @@ proc chckRange(i, a, b: int): int {.inline, compilerproc.}
 proc chckRangeF(x, a, b: float): float {.inline, compilerproc.}
 proc chckNil(p: pointer) {.inline, compilerproc.}
 
-proc pushFrame(s: PFrame) {.compilerRtl, inl, exportc: "nimFrame".} = nil
-proc popFrame {.compilerRtl, inl.} = nil
+proc pushFrame(s: PFrame) {.compilerRtl, inl, exportc: "nimFrame".} = discard
+proc popFrame {.compilerRtl, inl.} = discard
 
-proc setFrame(s: PFrame) {.compilerRtl, inl.} = nil
-proc pushSafePoint(s: PSafePoint) {.compilerRtl, inl.} = nil
-proc popSafePoint {.compilerRtl, inl.} = nil
-proc pushCurrentException(e: ref E_Base) {.compilerRtl, inl.} = nil
-proc popCurrentException {.compilerRtl, inl.} = nil
+proc setFrame(s: PFrame) {.compilerRtl, inl.} = discard
+proc pushSafePoint(s: PSafePoint) {.compilerRtl, inl.} = discard
+proc popSafePoint {.compilerRtl, inl.} = discard
+proc pushCurrentException(e: ref E_Base) {.compilerRtl, inl.} = discard
+proc popCurrentException {.compilerRtl, inl.} = discard
 
 # some platforms have native support for stack traces:
 const
@@ -38,6 +38,6 @@ proc raiseException(e: ref E_Base, ename: CString) {.compilerRtl.} =
 proc reraiseException() {.compilerRtl.} =
   sysFatal(ENoExceptionToReraise, "no exception to reraise")
 
-proc WriteStackTrace() = nil
+proc writeStackTrace() = discard
 
-proc setControlCHook(hook: proc () {.noconv.}) = nil
+proc setControlCHook(hook: proc () {.noconv.}) = discard
diff --git a/tests/manyloc/argument_parser/argument_parser.nim b/tests/manyloc/argument_parser/argument_parser.nim
index 1edda4aa0..6f4fb650e 100644
--- a/tests/manyloc/argument_parser/argument_parser.nim
+++ b/tests/manyloc/argument_parser/argument_parser.nim
@@ -292,9 +292,9 @@ proc parse_parameter(quit_on_failure: bool, param, value: string,
       raise_or_quit(EInvalidValue, ("parameter $1 requires a " &
         "float, but $2 can't be parsed into one") % [param, escape(value)])
   of PK_EMPTY:
-    nil
+    discard
   of PK_HELP:
-    nil
+    discard
 
 
 template build_specification_lookup():
diff --git a/tests/manyloc/keineschweine/lib/estreams.nim b/tests/manyloc/keineschweine/lib/estreams.nim
index bd0a2c31a..ecafaed89 100644
--- a/tests/manyloc/keineschweine/lib/estreams.nim
+++ b/tests/manyloc/keineschweine/lib/estreams.nim
@@ -7,10 +7,6 @@ proc swapEndian16*(outp, inp: pointer) =
   var o = cast[cstring](outp)
   o[0] = i[1]
   o[1] = i[0]
-when cpuEndian == bigEndian:
-  proc bigEndian16(outp, inp: pointer) {.inline.} = copyMem(outp, inp, 2)
-else:
-  proc bigEndian16*(outp, inp: pointer) {.inline.} = swapEndian16(outp, inp)
 
 import enet
 
diff --git a/tests/manyloc/nake/nake.nim b/tests/manyloc/nake/nake.nim
index eade28c70..4b1b35662 100644
--- a/tests/manyloc/nake/nake.nim
+++ b/tests/manyloc/nake/nake.nim
@@ -74,7 +74,7 @@ else:
           echo "Unknown option: ", key, ": ", val
       of cmdArgument:
         task = key
-      else: nil
+      else: discard
     if printTaskList or task.isNil or not(tasks.hasKey(task)):
       echo "Available tasks:"
       for name, task in pairs(tasks):