Tasks #0033 / #9999: Preparing for implicit matchlists + matching optimization.