More changes after peer-review at gstcevidenc.
Standardizing failure tags for goto's.
Removing extra return statement.