One less goto