Found solution for cycle issue for tail+branch solution, though it does
require creating an extra metadata-pair on relocate.
Need to get passing the advanced relocation tests, this is currently
failing. Also need to figure out why I added the assert on tail end, it
may be related.