BUG-9265: Switch empty type mapping from Void to Empty