KINFOO Better short reference escaping.