[spyro] A few minor improvements and another 30 or so lines.