MFC r251601, r251685:

  Handle options that override other options