Added support for new $origin line (formerly known as $OldId).