:Replace doesn't use the location-list anymore and small mapping fixes.