Closer alignment of pack() in -lockwait wrappers with struct flock field types