Internal Protocol: Make similar calls more consistent, remove unused/unnecessary arguments, reorder some arguments.