Refactored MutationMacro, extract conditions