This is another small step to moving primitives to be stored
inside Picture structs, which will simplify some of the
picture caching work.