Moved the responsibility for stripping/adding leading slashes around.