Remove direct reference to long type.