[3.1.0] Encoder optimization, as suggested by Diego