As below, I think you can completely avoid dealing in `ValDefs` here and work with symbols.