Implement mixed-reference forwarding properly