x86: various changes and cleanups to in_p/out_p delay details