Wire up new choice remove buttons. Closes #261.