Removed some horrible exceptions-as-flow-control.