A little bit more of type safety