Remove type hint template clutter