Revert "Move two checks from features/sfio into the code"

Revert "Move two checks from features/sfio into the code"

This reverts commit 2ba97c0ed14163aa41c74bcf0dd72822b13ac7c5.

This change broke gvpr, as demonstrated by the following gvpr script:
N [ color=="blue"] {color="red";}
N [ color=="blue"] {color="red";}
I don't know if the mods were more substantive than just cleanup
as they were related to other win64 work at the same time.