Not part of your change, but I wonder if this path option really needs to exist. It is pretty funky code.