Can you change these two lines to use `symbols('x y z')` and `symbols('f g', cls=Function)`? Then we can merge this.