Cosmetics / prep for preprocessing token parsing