Markup upgrades for enhanced-eval-when.