Refactor type embedding to simple boolean.