No actual change in functionality ... just get rid of uselessly complex
code to pass the number of keys via extra_data.