Use more type helper functions