Reorganize things a bit so that we no longer need the 'valid' flag on
each item.
Small comments update.

1 file changed