Client: cleaned up code related to editing annotation types.