first pass at #157, with trailing slashes