Minor code clean-up

... also added x64 to build options; no particular reason.