[spyro] A few more minor touchups.