Removed uses of "prog-end" now that we have new top-level scoping.