Move file from CVS; style updates.