simplify fixed-point include/insert loop; add not-nil check to f.p. loops