Promote non-javadoc comment to a more formal one.
Fix a bug which breaks test runs when more than 2 fields are specified
as 'out' fields.