This commit was manufactured by cvs2svn to create branch
'iter-adaptor-and-categories'.
simplified named parameters mechanism