Reinsert --no-browser option. Move some code to utils.main. Some other small style changes. Fix merge conflict misstakes.