From 80fc1f42c4222e467ad9e1a0ef69a6832b345d71 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Sun, 27 Jan 2013 17:45:23 -0600
Subject: [PATCH] clean up the preprocessor macro list

---
 preprocessor.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/preprocessor.py b/preprocessor.py
index 5fe331b64..3ef9e1e88 100644
--- a/preprocessor.py
+++ b/preprocessor.py
@@ -17,20 +17,23 @@ from extras.crystal import (
     TextEndingCommand,
     text_command_classes,
     movement_command_classes,
-    music_classes
+    music_classes,
 )
 
-macros = command_classes + \
-    [
+even_more_macros = [
     Warp,
     XYTrigger,
     Signpost,
     PeopleEvent,
     DataByteWordMacro,
     ItemFragment,
-    ] + [x[1] for x in text_command_classes] + \
-    movement_command_classes + \
-    music_classes
+]
+
+macros = command_classes
+macros += even_more_macros
+macros += [each[1] for each in text_command_classes]
+macros += movement_command_classes
+macros += music_classes
 
 # show lines before preprocessing in stdout
 show_original_lines = False