a few quick replaces to fix rawstring vs bytestring and an unused argument

Hi again, you guys said you were redoing a lot. Does that mean a redo of everything? What'll be re-used? Just curious.