Simplify skipping moved references (thanks scrawl)