Make the distinction between key-value and single-key arguments clearer.