     
     // Deal with words evaluated at compile-time.  Return true on
     // success.
-    //  TODO: See Definition.Body.SpecialForm comment.
-    func compileSpecialForm(handler: String) -> Bool {
-        switch (handler) {
+    // TODO: The initial idea was to associate Body.SpecialForm with a closure.
+    // However, this triggers lots of weird behavior from the Swift compiler so
+    // use the special form name for the time being.
+    func compileSpecialForm(name: String) -> Bool {
+        switch (name) {
         case ":":
             definitionState = .WaitingName
         case ";":

    
    func isSpecialForm(name: String) -> Bool {
        if let def = self[name] {
            if def.body.isSpecialForm {
                return true
            }
        }
        return false

        content.append(Definition(name: name, body: .Regular(phrase: CompiledPhrase(instructions: phrase))))
    }
    
    func appendSpecialForm(name: String) {
        content.append(Definition(name: name, body: .SpecialForm))
    }
    
    subscript(name: String) -> Definition? {
