More dehardcoding of slashes