Add Type(..) to imports so we can match None