Improved version line detection and added code to remove $Ids and
$OldIds before comparing files.