Merge in updates to make sure exit/return is done properly.