Remove some duplicate lines with definstruction macro