SI-1909 SI-3832 SI-7007 SI-7223 Improved handling of larval objects

Reclaims some ground lost in the first swing at SI-6666, and solves a few more issues to boot.

I'm hopeful that I'll be able to knock off the residuals of SI-6666 too, so I might push one or two more commits.

Review by @JamesIry