Also moved && and || to ends of lines instead of start. Fixed misc vertical alignments and some { needed newlining.
Our defines were never clear between what meant 64bit or x86_64 This makes a clear cut between bitness and architecture. This commit also has the side effect of bringing up aarch64 compiling support.
Matthew Parlane