Move a bunch of daemon arg parsing back into main