Further cleanup of URI and argument handling to preserve forwarding to PHP scripts and other silliness