Why change these to not use code points?