Rel9 3 stable spiff pred spiff refine

Eliminated unnecessary (multiple) definitions of the same pattern.