Fix 2: finish reorganisation of flambdacheck