Merge "Don't generate mv refs that won't be used"