A little additional cleanup. Removed ability to halt code from
command-line (for now).