Replaced more typeles instructions with type-specific ones