Original commit message from CVS: formatting cleanups convert more stuff to the generic seeking/convert/query interface