Re-apply pedantry