Revamp cause-types.