Simplify signature of start-server
Reorder defns as needed to compile
Remove unused fn args
For :headless just call start-server
Fixes #1093
Merge pull request #1098 from mtopolnik/fix-1095

Fix for Issue #1095