Re #9: Added identification of points and references on models.