More clean ups and a few performance wins.