Simplify base path rewriting