reduced memory footprint, plus assorted simplifications