clean up arity mismatch errors a bit