Several more big char cleanups