*8094* Share code for setup; reference changes