We should disallow the whitespace anyway, so I'll replace them both with a simple regex.