Fix lagging rename, missed 'cos of no clean build
Ensure annotations and links produce a creation callback (for indexing)