x86: pat.c more trivial changes