Better handling of code evaluated in Main