Replace all instances of Int64 or Clong with Int

This appears to fix the integer size issues on 32 bit, where integer literals are `Int32`s, and on Win64 where `Clong` is `Int32`. Re-closes #2