Finish removing need for pattern guards