Unbreak non-threaded x86, and use less #![-+]