Decouple start-server from after-init-hook