Clean up a bit, add smoke test on debugging ExpressionList