Additional control flow improvements...