Fix the new config tuples to work with our current control stream code