diff --git a/main/Cross.scala b/main/Cross.scala
index 1c1766a73..f09144a7c 100644
--- a/main/Cross.scala
+++ b/main/Cross.scala
@@ -17,9 +17,9 @@ object Cross
 	def switchParser(state: State): Parser[(String, String)] =
 	{
 		val knownVersions = crossVersions(state)
-		lazy val switchArgs = token(OptSpace ~> NotSpace.examples(knownVersions : _*)) ~ (token(Space ~> matched(state.combinedParser)) ?? "")
+		lazy val switchArgs = token(NotSpace.examples(knownVersions : _*)) ~ (token(Space ~> matched(state.combinedParser)) ?? "")
 		lazy val nextSpaced = spacedFirst(Switch)
-		token(Switch) flatMap { _ => switchArgs & nextSpaced }
+		token(Switch ~ OptSpace) flatMap { _ => switchArgs & nextSpaced }
 	}
 	def spacedFirst(name: String) = opOrIDSpaced(name) ~ any.+
 
diff --git a/util/complete/Parsers.scala b/util/complete/Parsers.scala
index 4a82ab482..fd0568494 100644
--- a/util/complete/Parsers.scala
+++ b/util/complete/Parsers.scala
@@ -27,7 +27,7 @@ trait Parsers
 		if(DefaultParsers.matches(ID, s))
 			OpChar | SpaceClass
 		else if(DefaultParsers.matches(Op, s))
-			IDStart | SpaceClass
+			IDChar | SpaceClass
 		else
 			any