Simpler handling of highlighting; prepare for richer result presentation.