(Glitch64) Combiner - small cleanups