I usually prefer quote expressions to constructing through `Expr` calls.  It would probably be good to be consistent throughout the code, so I could change this back if that's preferred.