Changed a few error patterns to match rustc's errors where it seemed reasonable.
Drops capture.rs. The new algorithm also checks for captures function arguments and obj fields.