Hint matching more conservative, to avoid loops.
Also tweaked the -V 3 debugging output