#318: change 'index, value' -> 'key, value'

Resolves #318.