Defensive copy definitely a good idea. I also like your suggested names -- will rename in-place for now; is `Entities` a good home for them, @aledsage?