Adapt foamj rules to aldor upstream changes.