This change should hopefully make implementations simpler and allow
a choice of names for arguments.