Rewrite model combinator to use same set of Background/Alternate windows for combinations; update to use new f names