.type constant cleanups.