clean up c4/c5 scanners to make flow similar to evex scanner
clean up c4/c5 scanners to make flow similar to evex scanner

(cherry picked from commit 13ca30276be99a352cdf77bce98652da5a0a6b30)

intelxed/xed,intelxed/xed,intelxed/xed,intelxed/xed