Some handling of non-Apache URIs
Some cleanup of classes when ApacheMapList is reused (fixes