Range-diff !476

back to !476 wiki: Architecture fixes; review gaps filed as #273-#282