[spyro] Various minor touchups.