Partial fix for annotation problems

Fix some bad assumptions in the find_next_link_in_path() function,
which allowed me to remove the two totally wrong hacks I put in
earlier