[jhc] darcs patch: don't require 'error' to be in scope for... (and 2 more)