changed order of FOREACH arguments

also removed some trailing whitespace
Merge branch 'tok-itr' into tok_stream

Conflicts:
	ccan/tok_itr/tok_itr.h
add one to val_len to account for null byte