Fix macro / import interaction with unqualified Connection type