Making prefix matching opt in.