Fix more column encoders for immediate substitution