Add choice removal support.