Simplified annotations for the tree-NI.cpp example