Change #ifndef __aarch64__ guards
Change the macro guarding idiom such that we stop using #ifndef aarch64 and instead use #ifdef x86_64 paired with an #elif defined(aarch64). This approach is more readable and more robust. The library was previously a mix of different approaches so this commit unifies the code.