Add anaphorization to a switch's default

Resolves #508