Fixes #4: Choice between fibo and T-shirt could be simpler