Type fixups.