Simplify bootstrap arguments a bit.