Minor tuning of encoder heuristics.