remove never-true code
Merge pull request #1600 from braddr/cleanup

Isolate CFseg usage in common code