Get back eval-after-load macro, fix compile warnings