Fixes #672.  Long ints are not handled correctly in Unit constructors.