Bug 17828: (QA followup) Add ->type and reuse it