Prevent circular execution; reorganize exit codes; minor clean-up.