Fix to cover all technically valid URLs.

Refs #56.