anchor.diff:                                                         case QUESTION_NORMAL:
                                                            mCVfrQuestionDB.RegisterQuestion (QName, VarIdStr, QId);
                                                            break;
  -                             case QUESTION_DATE:
  -                             mCVfrQuestionDB.RegisterNewDateQuestion (QName, VarIdStr, QId);
  -                             break;
  -                             case QUESTION_TIME:
  -                             mCVfrQuestionDB.RegisterNewTimeQuestion (QName, VarIdStr, QId);
  -                             break;
  -                             default:
  -                             _PCATCH(VFR_RETURN_FATAL_ERROR);
  -                             }
  +                                                       case QUESTION_DATE:
  +                                                       mCVfrQuestionDB.RegisterNewDateQuestion (QName, VarIdStr, QId);
  +                                                       break;
  +                                                       case QUESTION_TIME:
  +                                                       mCVfrQuestionDB.RegisterNewTimeQuestion (QName, VarIdStr, QId);
  +                                                       break;
  +                                                       default:
  +                                                       _PCATCH(VFR_RETURN_FATAL_ERROR);
  +                                                       }
                                                          $QHObj.SetQuestionId (QId);
                                                          $QHObj.SetVarStoreInfo (&Info);
                                                       >>
     vfrStatementHeader[&$QHObj]
                                                       << _SAVE_CURRQEST_VARINFO (Info); >>
  -                          << if (VarIdStr != NULL) delete VarIdStr; >>
  +                                                    << if (VarIdStr != NULL) delete VarIdStr; >>
     ;
   
   vfrQuestionHeaderWithNoStorage[CIfrQuestionHeader *QHObj] :
     <<
  -   EFI_QUESTION_ID   QId = EFI_QUESTION_ID_INVALID;
  +     EFI_QUESTION_ID   QId = EFI_QUESTION_ID_INVALID;
        CHAR8             *QName = NULL;
     >>
     {
  
positive.code:                                                           DObj.SetHelp (_STOSID(YH->getText()));
                                                            if (VarIdStr[0] != NULL) { delete VarIdStr[0]; } if (VarIdStr[1] != NULL) { delete VarIdStr[1]; } if (VarIdStr[2] != NULL) { delete VarIdStr[2]; }
                                                         >>
                                                       << {CIfrDefault DefaultObj(EFI_HII_DEFAULT_CLASS_STANDARD, EFI_IFR_TYPE_DATE, Val); DefaultObj.SetLineNo(L->getLine());} >>
      )
      ( vfrStatementInconsistentIf )*
    )
  
negative.code:   V:Varstore                                        << VSObj.SetLineNo(V->getLine()); >>
    (
        TN:StringIdentifier ","                       << TypeName = TN->getText(); LineNum = TN->getLine(); >>
      | U8:"UINT8" ","                                << TypeName = "UINT8"; LineNum = U8->getLine(); >>
      | U16:"UINT16" ","                              << TypeName = "UINT16"; LineNum = U16->getLine(); >>
      | U32:"UINT32" ","                              << TypeName = "UINT32"; LineNum = U32->getLine(); >>
      | U64:"UINT64" ","                              << TypeName = "UINT64"; LineNum = U64->getLine(); >>
      | D:"EFI_HII_DATE" ","                          << TypeName = "EFI_HII_DATE"; LineNum = D->getLine(); >>
      | T:"EFI_HII_TIME" ","                          << TypeName = "EFI_HII_TIME"; LineNum = T->getLine(); >>
    )
    { Key "=" FID:Number ","                          << // Key is used to assign Varid in Framework VFR but no use in UEFI2.1 VFR
                                                         if (mCompatibleMode) {
                                                           VarStoreId = _STOU16(FID->getText());
                                                         }
                                                      >>
    }
    {
      VarId "=" ID:Number ","                         <<
  