Replaced (and/c procedure-arity? normalized-arity?) with just procedure-arity?.