Fix problem with colliding signal arguments.