Finally added in a working make-ref.