Some cleanup and a few new types.