Various and sundry refactorings, and uriSafeName added