Suggestion htw

for !104 (comment 50361)

and for !104 (comment 50366) (i.e. it removes the debug_tree from return values and only creates the it if a debug tree is given as argument to e.g. scanner)