Annotate the entry cursor instead of the current storage for each cfg block