With this change, we now use well-defined kind parameters instead of the
non-standard 8.