Tidying up the extended Interset features a little.