Small cleanup and generics cleanup.