optimizer: Remove type aliases to work around compiler bug