Clarify Mapping path automatic cleanup

It wasn't clear what the `if uri.respond_to?(:request_uri)` was for.

Let's restructure the code to make it unnecessary and reveal our intent more clearly.

Thanks to @fofr for pointing this out.