[fix] Minor union-related refactor.