Missed a few encoding locations; trying to move them all into one place.