Replace long with integer_types, refs #38