This is a small series that cleans up struct consw a bit andprepares it for Control Flow Integrity checking (i.e. Clang's-fsanitize=cfi).Thanks!-Kees