Clean up "Expr" pattern