bootstrap: fix argument handling