Switch key type (d’oh!) and remove superfluous arguments.