avoid a copy when we can
minor clarity tweak
don't unnecessarily pre-group the nus
remove dead code