Make it so that handlers lookup arrities other than the first.

Fixes current build breakage.