Modest code reductions.