*8123* Reference simplifications