Index: src/main.cc
===================================================================
--- src/main.cc	(revision 4f748c526a24ee1180354967a91c27edd9dda5ce)
+++ src/main.cc	(revision 6de43b6499d8447e9107e8c7e176bd09fe406847)
@@ -81,5 +81,4 @@
 	expraltp = false,
 	libcfap = false,
-	preludep = false,
 	nopreludep = false,
 	noprotop = false,
@@ -94,5 +93,5 @@
 	codegenp = false,
 	prettycodegenp = false,
-	nolinemarks = false;
+	linemarks = false;
 
 static void parse_cmdline( int argc, char *argv[], const char *& filename );
@@ -341,5 +340,5 @@
 
 		CodeTools::fillLocations( translationUnit );
-		CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, ! nolinemarks );
+		CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, linemarks );
 
 		CodeGen::FixMain::fix( *output, treep ? "../prelude/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
@@ -379,5 +378,5 @@
 
 void parse_cmdline( int argc, char * argv[], const char *& filename ) {
-	enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Preamble, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, TupleExpansion, Validate, };
+	enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Linemarks, Nolinemarks, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, TupleExpansion, Validate, };
 
 	static struct option long_opts[] = {
@@ -391,5 +390,6 @@
 		{ "grammar", no_argument, 0, Grammar },
 		{ "libcfa", no_argument, 0, LibCFA },
-		{ "preamble", no_argument, 0, Preamble },
+		{ "line-marks", no_argument, 0, Linemarks },
+		{ "no-line-marks", no_argument, 0, Nolinemarks },
 		{ "no-preamble", no_argument, 0, Nopreamble },
 		{ "parse", no_argument, 0, Parse },
@@ -447,6 +447,7 @@
 			libcfap = true;
 			break;
-		  case 'L':										// surpress lines marks
-			nolinemarks = true;
+		  case Linemarks:
+		  case 'L':										// print lines marks
+			linemarks = true;
 			break;
 		  case Nopreamble:
@@ -454,7 +455,7 @@
 			nopreludep = true;
 			break;
-		  case Preamble:
-		  case 'N':										// read preamble
-			preludep = true;
+		  case Nolinemarks:
+		  case 'N':										// suppress line marks
+			linemarks = false;
 			break;
 		  case Prototypes:
Index: src/prelude/Makefile.am
===================================================================
--- src/prelude/Makefile.am	(revision 4f748c526a24ee1180354967a91c27edd9dda5ce)
+++ src/prelude/Makefile.am	(revision 6de43b6499d8447e9107e8c7e176bd09fe406847)
@@ -57,5 +57,5 @@
 
 bootloader.c : bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
-	${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+	${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
 maintainer-clean-local :
Index: src/prelude/Makefile.in
===================================================================
--- src/prelude/Makefile.in	(revision 4f748c526a24ee1180354967a91c27edd9dda5ce)
+++ src/prelude/Makefile.in	(revision 6de43b6499d8447e9107e8c7e176bd09fe406847)
@@ -526,5 +526,5 @@
 
 bootloader.c : bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
-	${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+	${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
 maintainer-clean-local :
Index: src/tests/Makefile.am
===================================================================
--- src/tests/Makefile.am	(revision 4f748c526a24ee1180354967a91c27edd9dda5ce)
+++ src/tests/Makefile.am	(revision 6de43b6499d8447e9107e8c7e176bd09fe406847)
@@ -107,23 +107,23 @@
 
 declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
-	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
-	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 extension : extension.c @CFA_BINDIR@/@CFA_NAME@
-	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
-	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
-	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 literals : literals.c @CFA_BINDIR@/@CFA_NAME@
-	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
-	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
Index: src/tests/Makefile.in
===================================================================
--- src/tests/Makefile.in	(revision 4f748c526a24ee1180354967a91c27edd9dda5ce)
+++ src/tests/Makefile.in	(revision 6de43b6499d8447e9107e8c7e176bd09fe406847)
@@ -860,23 +860,23 @@
 
 declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
-	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
-	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 extension : extension.c @CFA_BINDIR@/@CFA_NAME@
-	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
-	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
-	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 literals : literals.c @CFA_BINDIR@/@CFA_NAME@
-	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
-	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+	${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@