[spyro] A bunch of small language touchups.