[COMMIT] Change integer to fixnum in a few places where it wasn't possible mechanically.