Followup r70608, don't use master connection just for type check, and use getType...