Partially revert r60376: restore ability for ints to be automatically converted to floats, if a float type specifier is given to an int.  PEP 3101 should be clarified on this point.Also, remove unused local variables left over from r60376.