bootstrap: Get command line options working nicely