Octree templated with XYZSIFT and int (as branch container). Code cleanup.