Reworking some types.