As we get closer to a next VTK release, make sure this is
fairly clean or at least cleaner than it was.