Re: [PATCH 21.5] Union type fixes