Add new types, clean up calls.