avfilter/xbr: misc cleanup in FILT[234] macros