Improve a little the type closure.