Remove assumptions about .highlights and .target

Now there should be no code in the application that assumes the
existence of either of these.