Move from CVS repo; formatting.