More work on references.