Oh right, it's not related to this change but just a nit I forgot to fix way back when :P We don't need the if there since if `!variadic` then `expected_arg_count == supplied_arg_count`. Thus we can always just use `expected_arg_count` there.