make core hooks support 6 args, as required by entityTokenValues