Another take at the 2.10/2.11 spanning suppressMacroAttachment

It was only working on the former.