Slightly rework references.