WyCS: Bug fix for #404.
However, although this bug fix works, I'm going to make it more
efficient still.