WyCS: Performance Improvement for #404.
The previous rule used to fix #404 was less than efficient, and I've now
replaced it with something a little smarter.