Simplyfy function / arity check for plan (review comment)