Fixed operands for scanner and tweaked treewalker