further reduce redundancy, and remove double $(OPTS)