Fixed free variable trapping to allow case guards to be properly analysed.