It looks like Chris broke the code when mass-implemented normalize_uri().  There may be more, but I'll fix this one.