Move from CVS. Style updates.