Removing unnecessary #evaluate macro call