More encoding work.