Fixes for ~[T] deprecation

Some of these changes seem suspect. Once the language settles down,
I should revalute the use of vectors/slices.