Refactor choices normalization

Update utils.normalizeChoice to create new choices Object and to consider
separator objects.