Add validated s/def macro