x86: Move some conditional code around to avoid unused variable warnings