Tiny changes to the combiner.