Refactor out remaining eval-after-load