Fix DO-CATCH condition spillage plus some misc improvements.

Also, fixed one occurence of blanket (handler-case ... (condition ...)) usage.