Covert more duplicated GATK wrapper code to macros.