Fix issue with lexicals in eval; fix boot macro