Rule out more cases in 'recoverable'

Fixes #1136
Merge branch 'master' of github.com:idris-lang/Idris-dev