Move scalar and list matching to L2