Changed some choice longs to ints.

Are most of these even relevant? For Columns, they warn that they need
long ints for option.c.