Beginning on some post-range-apply fixes.