Small improvements to code generation for single MC FF.