Cleanup uses of setq