Simplify AddValueSymbols. No functionality change.